From d452eefe8f5ae7e266d836fca2ee0b52c7009f92 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 1 Nov 2016 18:09:58 +0000 Subject: [PATCH] Commit Debian 3.0 (quilt) metadata [dgit (2.9~) quilt-fixup] --- debian/patches/series | 1 + .../toolstestsx86_emulator-pass--no-pie--fno | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 debian/patches/toolstestsx86_emulator-pass--no-pie--fno diff --git a/debian/patches/series b/debian/patches/series index 802a9dedd1..cfdfaad480 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,3 +25,4 @@ tools-include-install.diff tools-xenmon-install.diff tools-xenstore-compatibility.diff ubuntu-tools-libs-abiname.diff +toolstestsx86_emulator-pass--no-pie--fno diff --git a/debian/patches/toolstestsx86_emulator-pass--no-pie--fno b/debian/patches/toolstestsx86_emulator-pass--no-pie--fno new file mode 100644 index 0000000000..4e893f1cac --- /dev/null +++ b/debian/patches/toolstestsx86_emulator-pass--no-pie--fno @@ -0,0 +1,48 @@ +From: Ian Jackson +Date: Tue, 1 Nov 2016 16:20:27 +0000 +X-Dgit-Generated: 4.8.0~rc3-0exp2 8662ddfdca7a536f1ed5fa06055d116505d42d6f +Subject: tools/tests/x86_emulator: Pass -no-pie -fno-pic to gcc on x86_32 + +The current build fails with GCC6 on Debian sid i386 (unstable): + + /tmp/ccqjaueF.s: Assembler messages: + /tmp/ccqjaueF.s:3713: Error: missing or invalid displacement expression `vmovd_to_reg_len@GOT' + +This is due to the combination of GCC6, and Debian's decision to +enable some hardening flags by default (to try to make runtime +addresses less predictable): + https://wiki.debian.org/Hardening/PIEByDefaultTransition + +This is of no benefit for the x86 instruction emulator test, which is +a rebuild of the emulator code for testing purposes only. So pass +options to disable this. + +These options will be no-ops if they are the same as the compiler +default. + +On amd64, the -fno-pic breaks the build in a different way. So do +this only on i386. + +Signed-off-by: Ian Jackson +CC: Jan Beulich +CC: Andrew Cooper + +squash! tools/tests/x86_emulator: Pass -no-pie -fno-pic to gcc + +Signed-off-by: Ian Jackson + +--- + +--- xen-4.8.0~rc3.orig/tools/tests/x86_emulator/Makefile ++++ xen-4.8.0~rc3/tools/tests/x86_emulator/Makefile +@@ -45,6 +45,10 @@ x86_emulate/x86_emulate.c x86_emulate/x8 + + HOSTCFLAGS += $(CFLAGS_xeninclude) + ++ifeq ($(XEN_TARGET_ARCH),x86_32) ++HOSTCFLAGS += -no-pie -fno-pic ++endif ++ + x86_emulate.o: x86_emulate.c x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h + $(HOSTCC) $(HOSTCFLAGS) -c -g -o $@ $< + -- 2.30.2